Minor improved timer function call overhead and small changes to makefile