further polish changes
resolved conflicts
removed brackets from 'optional' labels
final polish items
final polish items #96
final polish items #96