added a couple more features