a few improvements (not working yet for titles)