Great suggestions, tabas, thank you.

I'll get those 2 things updated soon, hopefully within the next few days.