Update

Most of these changes have been sitting here for months