done step + minor fixes