Fixed Units typesetting and added delimiter options