loads of changes related to Zk/MySQL