More refactoring, optimisations & level tweaking.