0002: some fixes for picture