site main code done.Tidy up beofre go live!