more small fowd tweaks