update comments, state logging, label names