Completed a few more tasks