few bugs fix