fixed bugs
commit to push