add spinner
clean up vars