bugfixes and windows executable