cleanups, fixes, etc...