other codebase updates