Haven't had the time to deal with this (at least partly). Would be good to enhance the current analysis if time allows.