fixing setup stuff