some issus fixed