improves comments and adds more states for nav ctrl msgs