Fixed a few bugs, added timed data again.