updates and fixes galore!
removed README.md~ which I accidentally added