blah
minor bug fixes