fix multiple return value handling, and add missing concat operator