fix type and more text