some minor bugs fixes added