some nicer formatting and new tools.