Once more fully working on pre-Eclair APIs; added other small improvements.