more cleanups, things are getting shape now