updates and cleanups

The commits tell the tale.