fix title
add location
use upper case