* minor code changes and optimizations, updated Readme