finished! (hopefully)

fixeed everything else.