Bugfixes and easier launcher