more bug fixes
speed
Reconf'ed.