Make goto labels visible
Add some stuff about exception handling
Clean up some things