pulled in weekend work on sfun core