More tweaks, niceness