few bugs solved