Final touches on setup