6.0 WIP b

mostly fixes.