Add full_state options to get full name of state

- Also do some small refactor