Minor bug fixes, data update.