Some fixes and Zukitwo updated.