more changes. i forgot what i did so pls check.