Renamed update to step; update am once aa is done (if you open the am quickly for some reason)
Friendlier filenames (removed dir if it's in the default and dropped the .png)