update with latest rules, fix grammar, fixes #126