My improvements & fixes

- Includes pull requests #126 and #140
- Fixes #145, #139, #132, #127, #124, #119 (at least I can't repro), #117, #110, #95, #56