Few small tweaks to try to make custom field setting work (it still doesn't) and some updates to the .gitignore