fixed and improved some expressions