Adding new formatters and fixing old ones