fixing forgmap beugs
fixing sthg else