More focussed expectations; touch up specs