OCT-7 complete. also fixes #919 and #206
OCT-10 done. Fixes #916
Merge pull request #941 from Gravecorp/test

OCT-7 complete. also fixes #919 and #206