Changed startup and fix docs