fixed some checks
removed overriden defaults from main setup script