Fix init and add completion (but commented out)