Bugfixes; nicer output