few bugs was fixed