A few fixes and more sentence generation stuff.
A few more tweaks.