Feature/rtomkowski/add accuracy and fix pluralization