Updated code to support multiple computers and fix some minor goofs