more changes

getting things into more working order