Add more functions to wallclock and improve makefile