Bug fixes, and file renaming