fix mail
refine makefile