nearly finish 'sites' issues