more updates on codebase