fixing small bugs
adding todo