reorder some decls and pointerize some receivers of structs