Added handling for convert, if and function calls.
Cleaned up variable handling.
Cleaned up blank line handling.