Made the animation better and merged in changes for US units of measure