Couple of new features and a fix for Safari