Aux files, some bug fixes