Added a bunch of updates. Not great tracking, HA.