id fix, minor fixes