Various optimisations & minor bugfixes