Updated setup.sh; cross-plugin mapping fixes