Code and Readme update