Updating to NDB and fixing more style guide type stuff.