Made some small changes, added furlongs and plural units