Some minor updates, but the code is broken, unfortunately...