we fixed many todos!