fixes, cleaning, and some minor stuff

hi