titler rework, some code cleanup and fixes