some changes and some todos