Bunch of Fixes - mostly for tyriac
More fixes - version 3.6002