0.8.7.3; minor tweaks