Bugs fixed for version 1.0

For version 1.0 if current review not approved