adds last comment; some fixes