fixing some stuff that I goofed on merging last time