bugfixing and file renaming