Upload pic + minor bug fixes