last bugfix, should be ready for a release now