Better handling of if statements & functions

Functions are now marked as functions not constants, the contents of if statements are now highlighted corrected.