initial commit
small cleanups
working somehow