added a couple more field tweaks