Fixes map so that it works right, adds event table.