Some macro mistakes are fixed.
Paranthesis mistake is fixed.
Who properties are added on.