Added connected executors. Fixed some blatant errors (no integration tests make this part suck).