More fixes made [testing continues]