change default # refs, bugfixes