Fixed Bugs and CR...