removed few bugs
