Added modifications as I'm doing 'em
Removed stuff that is mostly done...