cleaned up some, working on what I think are final touches on one end