Fixed missing condition for error mesuring
Updated Makefile

Added comments and used priceweight heuristics