Several fixes + Launcher

+ Fixes
+ starting working on launcher