more cleanups and additions and things