Added gauge and some more updates