more fixes
more cleanups