Fixed small bugs to get ready for release.