finished some more features