updates to vars and latest Annex commit