minor changes
fixed bugs