Final testing and changes