some bug fixes, code cleanup.

fgb