fixed syntax error and naming
fixed notices amd naming
fixed notices amd naming