Small improvement

Also add a new feature to grab a bunch of site info from website