hmm
cleanups and fixes
no uuid
fairly complete