Fixed some todo stuffs