Added some expression classes, fixed indenting