fixed bugs!

fixed bugs!