more tweaks
Merge branch '23-objects' into 25