@marina i'll try to address these when i next have time