A number of bugfixes, notably preventing keys being null and making line entry consistent (no more phantom column)