Indi chan

Problems pointed out by Ken fixed.