Bugfixes, actually running in a real-world scenario now. Next step: full Unit Test coverage.