Multiple changes / Fixes

Separated formatting methods to their own class
Multiple "dummy proofing" measures.
Added special "Tag" function for formatting.