Ridding of TODO's and some fixes