hopefully final junk tweaks