Debugged some stuff