Fixed some bugs based off Emily and Grete's comments