advanced title handling
updated TODO