Eman's Merges

Should contain Zane's "Movement corrected" changes
Two more file from Eman's merges