Fix #12 again.
Fix #58.
Fix #53.
Fix #61.
Fix #60.
Fix #59.
Fix #62.
Merge pull request #63 from shadowjay1/master

Fixes.