Hi ashs_as,I am a bit confused by your post...It is weird because I did not make so much modifications at once. Moreover, I  I cannot load this changeset on my PC to check and fix, my RAM is overloaded. 
Kindly yours. 
JFL-75