fixed parse expression and other function
fixed detection of single line of code