Added additional developer support and fixed bugs