* fix connector * fix more things * prepare release * cleanup * format * revert back to wrapper object * format