Fixed some whitespace issues
Hacked au functions together. Will fix later with Augroups