Bug fixes + model changes + first attempt at hammer mill