Added more emotions; changed to use metric units.