fixing and string. previous commit is because of patch by Dennis Craven and me...

fixing and string. previous commit is because of patch by Dennis Craven and me taking the strings/coding standrads review and stuff. fixing #382. Thanks Dennis once again