Added some TODOs, logging on orphan action and fixed unpublish action.