Map working fine + adding comments