simplify previous commit a bit
more cleanup, allow both singular and plural in results
0.1.6