Updated a few features