kuan - bugs fixed