Finished some more stuff