added map and fixed boundraries