3 needed corrections, 1 optional feature