Code cleanup, more cfs_fields changes, tweaks to Addons page