Fix start-state and add options