Tidy up, add macros, trying out a few new modes