repair bugs
modified