started fixing code, ome changes made