updates, fixes, and cleanups