fixes Makefile, lst, main
rebase master