fixing more things. still more things to fix.