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

I hope i did the changelog right this time :P