Various Updates

It's been a while since I synced the GitHub, so I figured might as well.