Fix bugs.
clean up project