fixed makefile and cleaned up Analyzer