Fix code, add keywords