Added some todo's and more cleanup.