fix launch bug and tidy up settings