legal fixes and simplification