Limiter added, and maps corrected