~ edited comments and stuff