fixed issues and upgraded