Add label states and correct things