changed some stuff that probably shouldn't have been changed