Minor bug fixes. Ready for use.