Update 30(a)
Some Minor Fixes....