Added Setup Project and fixes