Major Edit

Edited a lot of various things, probably not complete.