Updated some stuff that @AtomicBlom wanted.