More tweaks'n'shit