still planning
minor fixes before push