Debug
A few little changes