prep for exe and bugfixes