a lot of little changes

this and this