few bugs correction