Edited comments and noted some spots to inspect later