many tweaks to emma's stuff