Some tweaks

Basic tweaks because I'm falling asleep. Just like in the good ol' days :)