deleted TIMER comment in Makefile
more qualified imports