minor tweaks as suggested by HOT