Some changes

Can't remember exactly what, but some more edits