One last pull request before 1.2 ideally

This fixes a few issues once and for all and I updated the HISTORY for the 1.2 release to include all the big changes.