some minor bugfixes/format issues

- bugfix: I tampered with my own classes during cache filling, which resulted in errors
- bugfix: some annotations have been changed during last refactoring, causing condition checks to fail