Added location in Canada. Fixed JavaScript a bit.