solved few bugs