Sorry no squash, it is easy to start a new branch and work.

Closes #411 , #410 .