* Harm's Way - Some minor fixes. Test runs now without error. Stil issues #437 left.