fix/improve general