Minor modificatins, text fields corrected
Merge branch 'bugfixes'