comments  and minor uint cleanup