new version of the site. some code improvements