fixes for repeat calls and ampersands