auto refreshing and minor changes