Added expressions lib
small fixes to get it compiling