Fix Some Minor Bugs !.