More tweaks >_<