TODO items added and minor cleanup