More tooltip coolness, fix storage.