lots of little changes

finishing touches