check in for few bugs