simplify and fixes