Fixed launcher and some bugs