Fixed some bugs
Expressions seem to work now