Fixed error reporting function to handle cases where only 1 expected token type exists. Also added very basic error recovery.