add comments and FIX #12