fixed all "TODO" tasks