Makefile, code factoring, speedup, reset zoom

Enjoy.