Fixed minor issues and strings