Updated various minor features