More bugfixes and prettier output!