few bugs removed