fixed osme bugs and added colors