Fixes #7185, works on #7184
Fixes most of #7206, fixes #7200, fixes #7184
Removing macros.
Replacing a loop with the older code.
Merge pull request #7208 from Zuhayr/dev

More hardsuit fixes.