updates!

I think I merged things properly. There were a lot of conflicts - let me know!