Abbybased code bugs

by AbbyBased