More updates to the code and readme file