add date format
added else to conditional subst, variable modes and intable macro