Improved setup script a bit