Update setup script, fix endwise/delimitmate