updates

cleaned up some, not much more. Will finish this soon.