made some changes to clean up the code further. got rid of some of the TODOs that were done.