ah right on both points, will make those changes