Minor debugs for the first verison