fixed another bug
added some todos