Chucked in some basic tweaks