Fixed settings window popping up shortly if set to not display at launch
also cleaning up a bit