Bugfixes, restructured output