fixed a bunch of stuff under abby's supervision