Fix #67.
Fix #69.
Fix #70.
Fix #73.
Fix #66.
Fix #68.
Merge pull request #74 from shadowjay1/master

More fixes.