Picture new module, bug fixes