fixed some "TODO"