Numerous small changes. Added tipsy.