finished some more stuff