commit
fixed bugs