-- minor bugs fixed.