fixes and cleanups..