Fixed bugs
Fixed project settings