bugs fixed
clean up