more fixes and updates
stuff that for some reason didn't go through