Fill in some missing strings and capitalize for flexibility