More bug fixes w/ states