Fixed browser - and minor changes for optimization