Merging in updates

I forgot about this ;_;