Last few changes, still errors