more sensible Makefile
add TODO for simplification