Bugs fixed based on yusugomori.
junk files deleted.