Some improvemnts in the code and readme file