Cleaned TODO's and commented some more