more bugs fixed.