Further updates to Gmacs Exe TODO