Update empty fields
Correct last data issues

Fixes #14