small in makefile
many small fixes
merged conflicts