Kk devel

Just merge in patches from the old branch.