Clean up err handling, add TODOs for schemas