Bug fixes cos Tom can't read...