editing

Edited a bunch of stuff