Small changes in response to feedback from SashaCrofter.