Map stuff working

Fixed super boring and annoying bug