More bug fixes. Ready for trial release.