Various optimisations
Deploy script