some small bugs
some small changes