Updated my stuff

See the commits for what got changed.