various changes as discussed with George

See email 09/04/2014 @ 17:40