- bugfixes, part 2
- ready for alpha-use