improved setup.inc to allow ease of install