Fixed Somw Bugs