Some Browser class improvments
Some state logic fixes