More reliable test
Low level functions; no behavior was changed
Functions to insert pictures; warning reflections
Removed unused options; poi update