updates, additions, and fixes