refcount bug was somewhere else :) - also fix a switch/break weird spot