Separate out curl commands because servers must be started first, other minor improvements/fixes