Updated code, README etc.