cleared up some problems
fixing problems