Version 1.02 assorted bug fixes and improvements

Fixes #36
Fixes #37
Fixes #38