more changes, and building using clang