setup steps
minor fixes