underline feature, and crash fix