improved demo
cleanup
built