More fixes
More changes - see TODO