Fix error
Change link style
Minor changes
Update Makefile