Cleanup connect/disconnect behaviors and add some coloring to help identify state