Made some more changes due to stock issues on some components.