derp
fixed and renamed stuff