Improvements following comments on IRC