Bug fixes, horizontal picture null pointer