Moar changes

Removed tabbing interfering with the results, and made some various
minor string changes.