Handled some todos and added a few more