Makefile - helpful for packaging
Hardening + fix linking problem