Beta 0.9.2

Major revisions and corrections. Cleaning up unused code and whitespace.