few more bugs fixed.