Added codekit config and other fixes