More clean up, removing static on CFBundleRef -- may have been causing some issues...