Fixed bugs, renamed files, etc.