#16 adding a few flags to monitor the env (+pushState)