more changes from another kossel build