Added bootstrap and other optimisations.