Final changes. Working on fixing and displaying diagnosis engine.