Lots of changes

etc..