FIX: Fixed redrawing errors
FIX: Reserved words are no longer considered as variables