Partial fix of bird delivery

When caused by unwatched robot
Fixed a typo

And reformated some code