fixed and renamed catch table, added load events