Tweaks, add text entry to some fields
pulled from robert's branch