id fix, style corrections