* more bugs fixed.