Update #7.2

Some Bug Fixes