additional fixes, and compact expressions