Updated readme and code to fit changes