Fixed some stuff in kalamala folder