Almost ready for release. Minor changes and bug fixes.