Add new rabbers
Fix errors
Add new map events