More additions and cleanups