moar fixes and tweaks