Fixed bugs in previous features + JP dis/reconnection