#294 - small corrections during review (incomplete)