bugfixes and setup file changes