Most OCD stuff and a fix for the name problem.