Updated TODO
Added larger occupants pad size
Merge branch 'master' into xep-0223