sorted some setup issues