Added and edited lots of things