repo additions and cleanups