More debug and fixed some tabbing