fixed just few bugs