code quality improved almost ready for merge

-> heat map added
-> classes renamed according to contract