last minute mild tweaks, extensions