Corrections

Some Bug Corrections