changes to waterman_init_script and associated files