Fixed many todos!