Improve all teh things