Slight fixes and changes.