added some more nice tweaks