Added some minor functionality