Version 1.3.0.2

Some rough code is here. It hasn't been tested thoroughly. It needs
further integration.
A few more fixes

This should close #1 and #3
The other issues are in progress.