More documentation added and code changes