Fixed some todos and added a new item