code fixes and cleanups.