add small things forgotten by the merging
use mosh's Makefile