Reworked aux images. Some clean up.