More polishing and fixing
Improve speciation code
Add makefile