Some cleanups
Added gauges
Finalized upload