A bunch of changes to raw and error handling