Update title and some optimization fixes