fix + some debugging stuff