few bugs have been fixed