Various updates to codebase