Minor changes

Mostly updating files to work from another computer