Lot of issues fixed