big changes ==> static; and other +++ bug fixes