Code fixes, some changes in the readme files