more adds + changed some externs to typedefs