Optimize and titles

closes #211