added more setup stuff