Getting rid of TODO's and general fixes