performance fixes + minor triangle changes