Fixed last dangling thing
Improved the makefile further