tweaks suggested by erik