Fix bug + some experiments.