found a lot of bugs, added todo notices