Updates to work accross computers and some updated settings