Zukitre beta 3.14: Some fixes and tweaks.