fix missing colon
Update makefile
use member initialization
Typos
class name in constructor
Preparation for parser