bugs fixing, renaming main file