Few random modifications, including spinup which just has some random cli calls