clear pre-entered fields, more polishing
Merge branch 'samson'