minor changes + bug2 fixed