fixed some of rept issues..