fix errors connected with keeping map and player marker state