Update specs per Kristjan's excellent code review