Small Tweaks

- Just soem small tweaks, make the world a better place...