seems to work now. just some cleanup left.