Some christmas bug fixes :gift:

Fixed some bugs what I created last few commits. Also, updated non
launcher.