checking in recent progress & bug fix.