pimped the OUTPUT macro a bit and fixed some whitespace errors