Updates

Just some cleanup and updates before another release.