Picture functionality now all there, along with some other enhancements