cleaned up some problems