formating cleanup
PERCENT/PERCENTNAN support; switch on watter mark; formatting cleanup