Updates to startup

Loads of updates