Hint to Martin...
The actual name of the cipher isn't necessary to complete the grid...the answers which require encoding should become apparent as they will clash with ones that don't...say for example 3D requires to be encoded(it does) and 1A is normal(it is), the change required to the first letter of 3D to agree with 1A should be applied to all of the letters to give the encoded answer.