Misc
Rework discovery makefile; Much smaller filesize on windows now