Minor tweaks and state addition

Signed-off-by: Mario Kozjak <kozjakm1@gmail.com>