blah
Improvements and bug fixes