more TODOs with syberia restructuring