assorted bunch of changes...