Fix some varibales not being initialised in create(), meaing they
weren't reset when starting a state for the 2nd time