merged aknor's update into my codebase.
lots of changes, will document later....

Signed-off-by: Allan <zhyrohaad@bellsouth.net>