handle some expressions correctly
more thorough testing
0.0.3