some fixes, but there are too many for me to deal with right now...