Fix this mess

Pick a problem, see what actually gets rid of it.