more changes

now compiling