fixed bugs
cleanup