update parser according to 4  homework, added new structural entities, renamed something