bug fixes:
lines:
82-86

notes, 81 is hard