cleaned up some issues