Added/edited all kinds of stuff today