Edited
Fixed bugs