Improved pretty_expression
Few more bugs catched