Fix up tank part titles, block picking