Fixed issues and testing new fixes