construction bugfixes and more build changes