Tool output clean-up + fixes #6