fix on border property and on underscore handling