Finish the tweaks to the code

Issue with shortcuts and early PR commit :)