Fixing crashing bug + highlight on areas besides var