few bugs need to be fixed