fixes a couple other things