Several issues fixed. Nearly ready for release.