cleanup
fixed bugs