KucingKode fix: fix some bugs