Moved ConnectionDelegate to separate header; minor updates