fix spinner and other error