raw first fixes // no comments yet
Merge branch 'master' of github.com:peterkling/the_builder_fix