finish adding comments, not sure about worldmap