bugfixes and file name changes