Bugfix, naming, build script