docs, progress, refactoringc