More testing and changes