Fix gauge
Fix bugs