merge of Darren and my fixes to sx cal notebook