General cleanup and updates