Fixed Bugs and Made Modifications