pof serialization, more scenarios
minor changes