Removed a bjungload of junk and made data output better

Stuff