Indi + a couple bugs