Several bugfixes.
Bug fixes.
Merge branch 'chronicled' of github.com:michael/data into chronicled

Conflicts:
	data.js
Fix regression.
Merge branch 'chronicled' of github.com:michael/data into chronicled