Various updates to codebase
various updates