Finished some more tasks