Updating getstate and fixing some comments for demo