Fixed some bugs that appeared between JNIBWAPI and Bot and adjusted
clustering.