some of my latest changes

I'm uploading some of my latest changes. Still things going on locally