Patch 1

Some corrections