Merge SW/HF fixes. Update cfg. Add Orientation.