Fixed init and debugging