Catch improved, edit/create fixed, annotations added