Better setting of values & defaults