final tweaks, putting on hold to do FA blog first, using this as a starting point