Fancier display, some renaming, and... yah those variables? They were global ><