Bug fixes

CONTROLLED type problems with offsets issue fixed