fix some mistakes
initial preparation for Makefile