bugfixes and tweaks for new fields