small edits/merging
whoops forgot to fix collisions