update

Mostly just keeping it functioning. See the commit logs for more details.