few fixes
expression debug
grunted