Fixed some stuff + added debug lines.