Fix crash on close
Tweak makefiles; Fix full build and install