Clean up complete, add path completions, refactoring.