Minor Changes

Improved Reading and minor code changes