More bugfixes and output customization