Added a few quick features