Tweak main file
Update makefile