Updated some stuff so long ago that I forgot