fixed issues /suggestion raised by Giovanni