Fixed parentheses bug in macro
Bugfixes mainly