Fixes and a bunch of codebase additions