Little tweaks and fixes

Yay!