Fixed grammar, added edit functionality