Updated the format slightly to be betterer.
Updated formatting and disabled in trouble spots.