Removed gauges
Lots of improvements