[sd2_mr0632] Fix Scourgelord Tyrannus ground location and some cleanups.