fixes #2. fixes #3. timer
data.json changes