more tweaks to make the printer prettier
more style work
filter out the identifiers we introduce
fixed a broken test