Some clean up  + updates for kk