Fixed Mistakes