code cleanup, and updating more titles to show the whole title