Some improvements to Nitroshare: