More edits (quite extensive)