Some more bugs fixed.