more Makefile and Top.bsv updates