Merge with master, more variables

This syncs up the anthroconWIP with master, and adds a couple of additional variables not covered yet.