Simple grammar fixes. Working out output & DB