Added new sharing options, more bugfixes