Kuan - bugs fixed