Fix argument order when calling gcc (reapply debian patch)
Simplify makefile
Misc changes