Fixed Remaining Errors