Services consistent, green for htmlproof

aka Ready For Review :)