some fixes per Kaylea's suggestions, but there are major issues now