Add comments, rationalise state names