issue #887 changed toggle to regular button
issue #889 mac 32-bit / 64-bit ugliness fixed, but portends more of the same elsewhere