change expand behaviour of unit text fields
fix comment
adapt to new pretty print format