changes to make the stuff make more sense/work better