Huge update. Inculdes all my edits