moar better grammar, closes #360