Dec 10th additions and fixes