clean ups and updated todo