Fixed time, splashes persisting, word count
Merge pull request #57 from hamberguesa/fix_bugs

Fixed time, splashes persisting, word count