Improvements to sentence generator