Got diagonal rivers working

Some slight bugs introduced.