more bug fixes, and finishes addressing #80