Compiles after the refactorisation
Quite a few bug fixes
Speed adjust fixed