lots and lots of changes

[permalink]