added a bit more to the naught parser