Minor changes and done TODO.