Add @AltGr as main author
Simplify (and fix) the Makefile
Start fixing some some tests following the last branch merge.