Patriks changes, should be transfered to branch before pushing
Fixed merge conflicts. Identified and fixed agent drawing issue (did not sync with model coordinates).