Fix for issues #107 and #104 - index out of bounds in OBE
Some code clean up
LOS not updating on remote machine