20141106 - some fixes