Made some stuff work better