Minor fixes + tried to fix map