Updated readme and todos